nfdump: adjust patches

The second patch, which addresses a problem where the build would
include -I/usr/include, made the first patch obsolete. The first patch
had fixed the detection of pthreads, but this was a red herring caused
by the circumstances surrounding the second.

Signed-off-by: W. Michael Petullo <[email protected]>

diff --git a/net/nfdump/patches/010-musl-fixes.patch b/net/nfdump/patches/010-musl-fixes.patch
new file mode 100644 (file)
index 0000000..5894477
--- /dev/null
+++ b/net/nfdump/patches/010-musl-fixes.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -364,8 +364,6 @@ AM_COND_IF([BUILDNFPCAPD],
+               [AM_CONDITIONAL(BSDBPF, false) AM_CONDITIONAL(TPACKETV3, false) AM_CONDITIONAL(PLAINPCAP, false)],
+ )
+ 
+-AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
+-
+ OVS_CHECK_ATOMIC_LIBS
+ AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
+ 
+--- a/src/nfpcapd/Makefile.am
++++ b/src/nfpcapd/Makefile.am
+@@ -29,10 +29,4 @@ if HAVEPCAPAPPEND
+ AM_CPPFLAGS += -DHAVEPCAPAPPEND
+ endif
+ 
+-if HAVEZLIB 
+-AM_CPPFLAGS += -DHAVEZLIB
+-nfpcapd_SOURCES += pcap_gzip.c pcap_gzip.h
+-nfpcapd_LDADD += -lz
+-endif
+-
+ CLEANFILES = *.gch

diff --git a/net/nfdump/patches/010-musl-threads.patch b/net/nfdump/patches/010-musl-threads.patch
deleted file mode 100644 (file)
index 7deca09..0000000
--- a/net/nfdump/patches/010-musl-threads.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -367,11 +367,12 @@ AM_COND_IF([BUILDNFPCAPD],
- AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
- 
- OVS_CHECK_ATOMIC_LIBS
--AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
--
--LIBS="$PTHREAD_LIBS $LIBS"
--CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--CC="$PTHREAD_CC"
-+# Musl includes pthread functions in libc.
-+# AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
-+#
-+# LIBS="$PTHREAD_LIBS $LIBS"
-+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+# CC="$PTHREAD_CC"
- 
- # Check for structures
- AC_CHECK_MEMBER([struct sockaddr.sa_len],

diff --git a/net/nfdump/patches/020-musl-fixes.patch b/net/nfdump/patches/020-musl-fixes.patch
deleted file mode 100644 (file)
index 4d7c495..0000000
--- a/net/nfdump/patches/020-musl-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -364,8 +364,6 @@ AM_COND_IF([BUILDNFPCAPD],
-               [AM_CONDITIONAL(BSDBPF, false) AM_CONDITIONAL(TPACKETV3, false) AM_CONDITIONAL(PLAINPCAP, false)],
- )
- 
--AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
--
- OVS_CHECK_ATOMIC_LIBS
- # Musl includes pthread functions in libc.
- # AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
---- a/src/nfpcapd/Makefile.am
-+++ b/src/nfpcapd/Makefile.am
-@@ -29,10 +29,4 @@ if HAVEPCAPAPPEND
- AM_CPPFLAGS += -DHAVEPCAPAPPEND
- endif
- 
--if HAVEZLIB 
--AM_CPPFLAGS += -DHAVEZLIB
--nfpcapd_SOURCES += pcap_gzip.c pcap_gzip.h
--nfpcapd_LDADD += -lz
--endif
--
- CLEANFILES = *.gch